From e34149be74d5e4489c20e527e85e4b55d885ff2c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Aug 2020 10:46:54 +0100 Subject: [PATCH] Add patch to skip Yelp manual for bundled gtk-doc --- ...-manual-for-bundled-gtk-doc-subproje.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch diff --git a/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch b/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch new file mode 100644 index 0000000000..b52debc0d3 --- /dev/null +++ b/debian/patches/docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch @@ -0,0 +1,25 @@ +From: Simon McVittie +Date: Tue, 25 Aug 2020 10:42:40 +0100 +Subject: docs: Don't build Yelp manual for bundled gtk-doc subproject + +This adds dependencies that would otherwise be unnecessary. + +Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2475 +Signed-off-by: Simon McVittie +--- + docs/reference/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 1654463..905af97 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -7,7 +7,7 @@ if get_option('gtk_doc') + # for the time being + dependency('gtk-doc', version: '>=1.99', + fallback: ['gtk-doc', 'dummy_dep'], +- default_options: ['tests=false']) ++ default_options: ['tests=false', 'yelp_manual=false']) + + glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') + glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') diff --git a/debian/patches/series b/debian/patches/series index fc33be15a1..2b2638b9a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch cloudprint-Fix-redundant-declarations.patch roaring.-ch-Add-attribution-and-licensing-information.patch Include-a-copy-of-the-Apache-license.patch +docs-Don-t-build-Yelp-manual-for-bundled-gtk-doc-subproje.patch -- 2.30.2